Autogenerated HTML docs for v1.8.2.1-418-gaec3f
diff --git a/git-pull.html b/git-pull.html index 4616452..35be5fa 100644 --- a/git-pull.html +++ b/git-pull.html
@@ -1616,6 +1616,17 @@ </p> </dd> <dt class="hdlist1"> +diff-algorithm=[patience|minimal|histogram|myers] +</dt> +<dd> +<p> + Tells <em>merge-recursive</em> to use a different diff algorithm, which + can help avoid mismerges that occur due to unimportant matching + lines (such as braces from distinct functions). See also + <a href="git-diff.html">git-diff(1)</a> <code>--diff-algorithm</code>. +</p> +</dd> +<dt class="hdlist1"> ignore-space-change </dt> <dt class="hdlist1">
